From 6c673e507c2d62dffc6aebb4a3dc21d114d29746 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Thu, 18 Jul 2002 09:42:56 +0000
Subject: [PATCH] Remove conflict marker.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 109f1d7ebc3..049322e0ba2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -83,7 +83,6 @@
 	* international/utf-8-subst.el: Populate utf-8-subst-rev-table.
 	(utf-8-subst-table): Don't set.
 
->>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule.el (define-coding-system-alias):
-- 
2.30.2